Enable test harness support for gloas block production & import#8844
Draft
jimmygchen wants to merge 9 commits intosigp:unstablefrom
Draft
Enable test harness support for gloas block production & import#8844jimmygchen wants to merge 9 commits intosigp:unstablefrom
jimmygchen wants to merge 9 commits intosigp:unstablefrom
Conversation
Comment on lines
+267
to
+288
| // TODO(gloas): Replace with full process_execution_payload_envelope once | ||
| // available in the replay path. This workaround is needed because replay | ||
| // doesn't have access to envelopes, only blocks. | ||
| // https://github.com/sigp/lighthouse/issues/8590 | ||
| // | ||
| // For gloas blocks, simulate the minimal effects of | ||
| // process_execution_payload_envelope that are needed for subsequent block | ||
| // processing: | ||
| // 1. Set latest_block_hash from the bid so the next block's bid verification | ||
| // passes. | ||
| // 2. Cache the block's state_root in latest_block_header so that | ||
| // per_slot_processing's cache_state uses it (instead of recomputing from | ||
| // tree hash, which would reflect the latest_block_hash change and produce | ||
| // an incorrect state_roots entry). | ||
| if let Ok(bid) = block.message().body().signed_execution_payload_bid() { | ||
| if let Ok(latest_block_hash) = self.state.latest_block_hash_mut() { | ||
| *latest_block_hash = bid.message.block_hash; | ||
| } | ||
| if self.state.latest_block_header().state_root == Hash256::zero() { | ||
| self.state.latest_block_header_mut().state_root = block.state_root(); | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
I am going to work on a cleaned up version of this for:
In general it seems like the "prod changes" in this PR are mostly hacks, it might be better to plug these holes before merging stuff we know is definitely wrong?
Member
There was a problem hiding this comment.
By plugging holes, I mean, work on the proper versions of these checks + features, then update the test harness.
Member
Author
There was a problem hiding this comment.
yes agree, i haven't got a chance to review this myself, just wanted to get an idea how big of a change this requires.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Enables the test harness to produce and import gloas blocks, getting
check_all_blocks_from_altair_to_gloaspassing. Builds on #8754.Production changes (~75 lines)
block_verification.rslatest_block_hashfrom bid, cachestate_rootinlatest_block_header.block_verification.rsload_parentstate root sanity check for gloas.block_replayer.rsexecution_payload.rsPayloadNotifier::newreturnsIrrelevantfor gloas.gloas.rs/produce_block.rsBlockProductionResultreturnsBeaconStateandOption<ExecutionPayloadEnvelope>.Test harness / test changes (~600 lines)
make_blockandadd_block_at_slotwired up for gloas block production and envelope processing.TODO(EIP-7732)+ Gloas TODO tracking issue #8590.Additional Info
The block import path workarounds are needed because blocks are always imported before envelopes in gloas. Independent of and compatible with the envelope processing pipeline in #8806.